From: Michael Albinus <michael.albinus@gmx.de>
Date: Mon, 28 Sep 2009 14:27:08 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~10243
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=f2197aea185862151f1f8e89df2da026f5e8a432;p=emacs.git

*** empty log message ***
---

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index b75d1d27c6f..d92ba2ebf36 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,7 +1,20 @@
+<<<<<<< ChangeLog
+2009-09-28  Michael Albinus  <michael.albinus@gmx.de>
+
+	* tramp.texi (History): Add IMAP support.
+	(External methods): Add `imap' and `imaps' methods.
+	(GVFS based methods): Add indices for `davs'.
+	(Password handling): Rename anchors.  Add IMAP entries for
+	~/.authinfo.gpg.
+
+	* trampver.texi: Set default value of `emacsimap'.
+
+=======
 2009-09-22  Daiki Ueno  <ueno@unixuser.org>
 
 	* gnus.texi (Security): Document mm-sign-option and mm-encrypt-option.
 
+>>>>>>> 1.320
 2009-09-13  Chong Yidong  <cyd@stupidchicken.com>
 
 	* dired-x.texi (Technical Details): Delete